Merge pull request #725 from albertsun/master
bump weibo_2 and rest-client dependency
Andrew Cantino
2 zmienionych plików z 12 dodań i 13 usunięć
+ 1
- 1
Gemfile
@@ -8,7 +8,7 @@ gem 'net-ftp-list', '~> 3.2.8' # FtpsiteAgent |
||
| 8 | 8 |
gem 'wunderground', '~> 1.2.0' # WeatherAgent |
| 9 | 9 |
gem 'forecast_io', '~> 2.0.0' # WeatherAgent |
| 10 | 10 |
gem 'rturk', '~> 2.12.1' # HumanTaskAgent |
| 11 |
-gem 'weibo_2', '~> 0.1.4' # Weibo Agents |
|
| 11 |
+gem 'weibo_2', '~> 0.1' # Weibo Agents |
|
| 12 | 12 |
gem 'hipchat', '~> 1.2.0' # HipchatAgent |
| 13 | 13 |
gem 'xmpp4r', '~> 0.5.6' # JabberAgent |
| 14 | 14 |
gem 'mqtt' # MQTTAgent |
+ 11
- 12
Gemfile.lock
@@ -122,7 +122,7 @@ GEM |
||
| 122 | 122 |
eventmachine (1.0.7) |
| 123 | 123 |
execjs (2.3.0) |
| 124 | 124 |
extlib (0.9.16) |
| 125 |
- faraday (0.9.0) |
|
| 125 |
+ faraday (0.9.1) |
|
| 126 | 126 |
multipart-post (>= 1.2, < 3) |
| 127 | 127 |
faraday_middleware (0.9.1) |
| 128 | 128 |
faraday (>= 0.7.4, < 0.10) |
@@ -190,10 +190,10 @@ GEM |
||
| 190 | 190 |
jquery-rails (3.1.1) |
| 191 | 191 |
railties (>= 3.0, < 5.0) |
| 192 | 192 |
thor (>= 0.14, < 2.0) |
| 193 |
- json (1.8.1) |
|
| 193 |
+ json (1.8.2) |
|
| 194 | 194 |
jsonpath (0.5.6) |
| 195 | 195 |
multi_json |
| 196 |
- jwt (1.0.0) |
|
| 196 |
+ jwt (1.3.0) |
|
| 197 | 197 |
kaminari (0.16.1) |
| 198 | 198 |
actionpack (>= 3.0.0) |
| 199 | 199 |
activesupport (>= 3.0.0) |
@@ -215,7 +215,7 @@ GEM |
||
| 215 | 215 |
memoizable (0.4.2) |
| 216 | 216 |
thread_safe (~> 0.3, >= 0.3.1) |
| 217 | 217 |
method_source (0.8.2) |
| 218 |
- mime-types (1.25.1) |
|
| 218 |
+ mime-types (2.4.3) |
|
| 219 | 219 |
mini_portile (0.6.1) |
| 220 | 220 |
minitest (5.5.0) |
| 221 | 221 |
mqtt (0.3.1) |
@@ -225,6 +225,7 @@ GEM |
||
| 225 | 225 |
mysql2 (0.3.16) |
| 226 | 226 |
naught (1.0.0) |
| 227 | 227 |
net-ftp-list (3.2.8) |
| 228 |
+ netrc (0.10.3) |
|
| 228 | 229 |
nokogiri (1.6.4) |
| 229 | 230 |
mini_portile (~> 0.6.0) |
| 230 | 231 |
oauth (0.4.7) |
@@ -294,14 +295,12 @@ GEM |
||
| 294 | 295 |
rb-fsevent (0.9.4) |
| 295 | 296 |
rb-inotify (0.9.5) |
| 296 | 297 |
ffi (>= 0.5.0) |
| 297 |
- rdoc (4.1.1) |
|
| 298 |
- json (~> 1.4) |
|
| 299 | 298 |
ref (1.0.5) |
| 300 | 299 |
responders (1.1.1) |
| 301 | 300 |
railties (>= 3.2, < 4.2) |
| 302 |
- rest-client (1.6.8) |
|
| 303 |
- mime-types (~> 1.16) |
|
| 304 |
- rdoc (>= 2.4.2) |
|
| 301 |
+ rest-client (1.7.3) |
|
| 302 |
+ mime-types (>= 1.16, < 3.0) |
|
| 303 |
+ netrc (~> 0.7) |
|
| 305 | 304 |
retriable (1.4.1) |
| 306 | 305 |
rr (1.1.2) |
| 307 | 306 |
rspec (3.0.0) |
@@ -432,11 +431,11 @@ GEM |
||
| 432 | 431 |
webmock (1.17.4) |
| 433 | 432 |
addressable (>= 2.2.7) |
| 434 | 433 |
crack (>= 0.3.2) |
| 435 |
- weibo_2 (0.1.6) |
|
| 434 |
+ weibo_2 (0.1.7) |
|
| 436 | 435 |
hashie (~> 2.0.4) |
| 437 | 436 |
multi_json (~> 1) |
| 438 | 437 |
oauth2 (~> 0.9.1) |
| 439 |
- rest-client (~> 1.6.7) |
|
| 438 |
+ rest-client (~> 1.7.3) |
|
| 440 | 439 |
wunderground (1.2.0) |
| 441 | 440 |
addressable |
| 442 | 441 |
httparty (> 0.6.0) |
@@ -531,6 +530,6 @@ DEPENDENCIES |
||
| 531 | 530 |
unicorn |
| 532 | 531 |
vcr |
| 533 | 532 |
webmock (~> 1.17.4) |
| 534 |
- weibo_2 (~> 0.1.4) |
|
| 533 |
+ weibo_2 (~> 0.1) |
|
| 535 | 534 |
wunderground (~> 1.2.0) |
| 536 | 535 |
xmpp4r (~> 0.5.6) |